Let gtk_widget_get_path() correct early calls during init().

diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index 75e01df78b1645ede0eb08c06d912083ea47bebe..838e4254323a71e8cea15c619a98886654a08cee 100644 (file)
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -13772,6 +13772,18 @@ gtk_widget_get_path (GtkWidget *widget)
 {
   g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
 
+  /* As strange as it may seem, this may happen on object construction.
+   * init() implementations of parent types may eventually call this function,
+   * each with its corresponding GType, which could leave a child
+   * implementation with a wrong widget type in the widget path
+   */
+  if (widget->priv->path &&
+      G_OBJECT_TYPE (widget) != gtk_widget_path_get_widget_type (widget->priv->path))
+    {
+      gtk_widget_path_free (widget->priv->path);
+      widget->priv->path = NULL;
+    }
+
   if (!widget->priv->path)
     {
       GtkWidget *parent;
@@ -13795,6 +13807,10 @@ gtk_widget_get_path (GtkWidget *widget)
 
       if (widget->priv->name)
         gtk_widget_path_iter_set_name (widget->priv->path, pos, widget->priv->name);
+
+      if (widget->priv->context)
+        gtk_style_context_set_path (widget->priv->context,
+                                    widget->priv->path);
     }
 
   return widget->priv->path;
@@ -13839,6 +13855,13 @@ gtk_widget_get_style_context (GtkWidget *widget)
       gtk_style_context_set_path (widget->priv->context,
                                   widget->priv->path);
     }
+  else
+    {
+      /* Force widget path regeneration if needed, the
+       * context will be updated within this function.
+       */
+      gtk_widget_get_path (widget);
+    }
 
   return widget->priv->context;
 }